Merge branch 'deb/emacs22/d/sid/upstream' into deb/emacs22/d/sid/master
authorRob Browning <rlb@defaultvalue.org>
Fri, 5 Sep 2008 16:24:04 +0000 (11:24 -0500)
committerRob Browning <rlb@defaultvalue.org>
Fri, 5 Sep 2008 16:24:04 +0000 (11:24 -0500)

Trivial merge